merge trunk
authorK. Handa <handa@gnu.org>
Sun, 23 Jun 2013 07:45:33 +0000 (16:45 +0900)
committerK. Handa <handa@gnu.org>
Sun, 23 Jun 2013 07:45:33 +0000 (16:45 +0900)

Trivial merge